Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship>
Wed, 14 Apr 2010 14:49:40 +0000 (14:49 +0000)
committerKatsumi Yamaoka <katsumi@flagship>
Wed, 14 Apr 2010 14:49:40 +0000 (14:49 +0000)
commit022674342b99034557015f44ef5b20c36a2781f0
tree25acadd49f7d4777c2b417b5825a7c248fecbd23
parentbae0cfd3e7422f1a5c786a9186682d1e156c627e
parent16e946e16033149843f4d9c60d90a0f330fe7293
Merge from mainline.